From: Christophe Fergeau <cfergeau@redhat.com>
Date: Thu, 29 May 2014 21:28:44 +0000 (+0200)
Subject: Stop using Meta.KeyBindingFlags.REVERSES for IM switch keybinding
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2251
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e8fa2b641733c6e14c1b4bc02cf871c72cd92778;p=gnome-shell.git

Stop using Meta.KeyBindingFlags.REVERSES for IM switch keybinding

When this flag is set on a MetaKeyBinding, mutter will know that
the keybinding has an associated reverse keybinding triggered with
the shift modifier. However, an undesirable side-effect is that
gnome-control-center keyboard panel does not know that this 'shift'
is reserved for these reverse keybindings and cannot detect
conflicting bindings in this case.
This 'reverse' logic can now be handled at a higher level (in gcc keyboard
panel) so this commit removes it from gnome-shell so that they do not
conflict.

https://bugzilla.gnome.org/show_bug.cgi?id=732296
---

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 032b9d529..51b90fa91 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -366,13 +366,12 @@ const InputSourceIndicator = new Lang.Class({
         this._keybindingAction =
             Main.wm.addKeybinding('switch-input-source',
                                   new Gio.Settings({ schema_id: "org.gnome.desktop.wm.keybindings" }),
-                                  Meta.KeyBindingFlags.REVERSES,
+                                  Meta.KeyBindingFlags.NONE,
                                   Shell.KeyBindingMode.ALL,
                                   Lang.bind(this, this._switchInputSource));
         this._keybindingActionBackward =
             Main.wm.addKeybinding('switch-input-source-backward',
                                   new Gio.Settings({ schema_id: "org.gnome.desktop.wm.keybindings" }),
-                                  Meta.KeyBindingFlags.REVERSES |
                                   Meta.KeyBindingFlags.IS_REVERSED,
                                   Shell.KeyBindingMode.ALL,
                                   Lang.bind(this, this._switchInputSource));